Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 14:54:57 +0000 (15:54 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 14:54:57 +0000 (15:54 +0100)
commitb3bfc244929118e7ad373551b188d435c54548e5
tree1a84ae90773ccd235664e2cbd55617867bddc0e5
parent4065bf58d5c02bcf516e33bf0d115c839fa99c7e
parent5dda725fe746d24e899307309f515cad32619474
Merge from trunk
src/ChangeLog